Merge commit 'upstream/0.4.5+svn3450_dfsg2'
authorAlessio Treglia <alessio@debian.org>
Sat, 4 Feb 2012 11:18:33 +0000 (12:18 +0100)
committerAlessio Treglia <alessio@debian.org>
Sat, 4 Feb 2012 11:18:33 +0000 (12:18 +0100)
commitd22673584ee933c28521c19dd0900cc9b2bcf790
treed8ab6c6c7657a97eae26b33ccf9879ff84df0e55
parent4581fb5b1b9311c142046a7cb45bf980c99dfcee
parent3a08a1d5cbda89c2dea84a5b024e824137a59d0c
Merge commit 'upstream/0.4.5+svn3450_dfsg2'